From 8229a81fa41bcccb5db5e1ffba10c2975ee750ed Mon Sep 17 00:00:00 2001 From: tsteven4 Date: Tue, 15 May 2018 21:04:22 -0600 Subject: [PATCH] fix up travis LDFLAGS. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 28f6819a7..9e9a9d18e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,7 +56,7 @@ install: script: - if [ "${USE_DOCKER}" = "true" ]; then ./docker_hook; fi - - if [ "${USE_DOCKER}" = "false" ]; then QMAKE=/opt/qt${QT_VERSION}/bin/qmake LUPDATE=/opt/qt${QT_VERSION}/bin/lupdate LRELEASE=/opt/qt${QT_VERSION}/bin/lrelease LDFLAGS=-Wl,-rpath,/opt/qt${QT_VERSION}/lib ./build_and_test; fi + - if [ "${USE_DOCKER}" = "false" ]; then QMAKE=/opt/qt${QT_VERSION}/bin/qmake LUPDATE=/opt/qt${QT_VERSION}/bin/lupdate LRELEASE=/opt/qt${QT_VERSION}/bin/lrelease LDFLAGS="-Wl,-rpath,/opt/qt${QT_VERSION}/lib -L/opt/qt${QT_VERSION}/lib" ./build_and_test; fi # partially undo qt${QT_VERSION}-env.sh for linuxdeployqt based on https://github.com/probonopd/linuxd # - unset QTDIR; unset LD_LIBRARY_PATH; unset PKG_CONFIG_PATH; - if [ "${USE_DOCKER}" = "false" ]; then export VERSION=$(git rev-parse --short HEAD); fi # linuxdeployqt uses this for naming the file -- 2.30.2